Merge "Remove click listeners from app op icons" into rvc-dev