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

Change-Id: I2d10c88fb46924e096c958c500c049d17fb1b3bf