Merge "Controls UI - Spinner cleanup" into rvc-dev am: 5f35da6c5c am: b3f0df8d68 am: b6b887f769 am: ca3b3aec9a

Change-Id: Iaa8d7110877abaff40f014d0bdcd6d23be056754