Merge "Inline controls redesign" into rvc-dev am: eaebc654 am: 459db556 am: b6c9dbd8 am: eeecc7a7 Change-Id: I1675746b1e0b4b4235b60b6a5c7d7313584866c5