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

Change-Id: Ifb187a215a1e2b69116fda820a4a283ac4850d5f