Merge "Controls UI - GAR adjustments" into rvc-dev am: 97a8c8a1 am: 73c50afb am: 8b44b57e am: 6255167e Change-Id: I4898f74cd79e8958a3db76fe40f0e28cd7f9d1ba