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

Change-Id: I8fe7f36e4dd00be01a900fd2789f47addab55944