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

Change-Id: Icebf22f6e2448f48a4a82e3fc50b3ac2feebc18b