Merge "Make enable_pip_ui_state_on_entering android.app" into main