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