Merge "[DO NOT MERGE] Revert "Enable indicators if experiment flag is not present"" into rvc-qpr-dev