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

Change-Id: Ic7f0e8f9ff742a971b29b013987fb6265894fe4e