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

Change-Id: Icd3475806f676fd21adae1b4aa58ad6908b1a17c