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

Change-Id: I74475c65ce35818983e08fcea78607d3edbccb2b