Merge "Merge "Controls UI - Detail dialog fix" into rvc-dev am: fe4bd76a58 am: 784fa01fce am: 115854832e" into rvc-qpr-dev-plus-aosp am: baf55ca0b4
Change-Id: I65476f606b8ac96f282a7254ea53a9e01714c19e
This commit is contained in: