Merge "Add aconfig: enable_pip_ui_state_on_entering" into main