Merge "Controls UI - Service processing enhancements" into rvc-dev am: 23717b0838

Change-Id: I0e5468d0d0fb623e0d3c26271ecac6a54def8e1d