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