Merge "Controls UI - Haptics updates" into rvc-dev am: b86ab6ef33 am: 19ebdcd575 am: 2189056dd6 am: 636e63389d am: 6b9308e9d7
Change-Id: Id10ca50a6da60373fa4402468bd85f67afaca1fa
This commit is contained in: