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

Change-Id: If0a37399ad80e400333bdedebd2eecaa8c123306