Merge "Stop controller from steal preference clicks" into rvc-dev