Merge "Inline controls redesign" into rvc-dev am: eaebc6540c am: 259609c5cb am: 6c2c762a64 am: 9128775d94

Change-Id: Ia751b3e9a2c630568165c9b09f22baaeadf17c55