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

Change-Id: I2a0de060f66734715d49cdab67b490a9eeae35d2