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

Change-Id: I9cf2d50583f36dfff992807010d4596b298a3afb