Merge "Merge "Inline controls redesign" into rvc-dev am: eaebc654 am: 259609c5" into rvc-d1-dev-plus-aosp