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

Change-Id: I707ef4b93049f637b5043ffd8837b679f12366ab