Merge "Inline controls redesign" into rvc-dev