Merge "Add feature check before entering PIP."