Merge "Fixed a test for app ops icons" into rvc-dev