Merge "Remove app ops indicators from notifications"