Merge "Inline controls redesign" into rvc-dev am: eaebc654 am: 259609c5 am: 6c2c762a am: 9128775d Change-Id: Ia751b3e9a2c630568165c9b09f22baaeadf17c55