Merge "Inline controls redesign" into rvc-dev am: eaebc6540c

Change-Id: I80c2c23aa51089815c59719d683506f88039d0dc