Merge "Adding AppOps setting for entering PiP when hidden."