Merge "Controls a11y - Ensure minHeight on dialogs" into rvc-dev am: 61bc481d62 am: 0a84c85c1b

Change-Id: I7d8fb79e0f2502e0a906006c0fe41e55bd6688be