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

Change-Id: Ia0dd5a276699e2e9b908972390ccee122fda69ca