Merge "Fix AppButtonPreferenceControllerTest" into rvc-dev