Merge "Stop controller from steal preference clicks" into rvc-dev am: 9f6351b596
am: 907051e8c0
am: 4d16f6d18f
Change-Id: I2416cd9398150b60711c464aef0d29a525f54c72
This commit is contained in: