Merge "Merge "Fix wrong candidate window when display immersive_mode_confirm." into rvc-dev am: 0bf88c5a am: a56ba188" into rvc-d1-dev-plus-aosp