Merge "Controls UI - Haptics updates" into rvc-dev am: b86ab6ef33 am: 19ebdcd575

Change-Id: Ida3509e5198cf774241642cb4f7aded13eb5befe