Merge "Inline controls redesign" into rvc-dev am: eaebc6540c am: 259609c5cb

Change-Id: I4f3af9829c473f8ebec9728f8a1f45409c8a89af