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

Change-Id: I3003361d16584e136d16feeafc5d8800c7fa7429