Merge "Merge "Let confirmation dialog can appear" into rvc-dev am: 4e10d57e34 am: fc31ef0de9" into rvc-d1-dev-plus-aosp