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

Change-Id: I37f1c952e49d5d585d87720a84256495c4589965