Merge "Controls UI - Rename 'quick controls'" into rvc-dev am: bc445710 am: 07d27761 am: 50fb0b8f Change-Id: I29e83efc82b5029bde57fae5a60c5d11b4a13a4e