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

Change-Id: I1675746b1e0b4b4235b60b6a5c7d7313584866c5