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