Merge "DO NOT MERGE Revert "Remove app ops indicators from notifications"" into rvc-qpr-dev