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

Change-Id: I1a21a7ed020875b9b27129592b2fb2f3af93a9c6