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

Change-Id: I9638c69c6cb6518be374eef09b81b46531509894