Merge "Remove app ops indicators from notifications" into rvc-qpr-dev