Merge "Dismiss the PiP if user changes setting while PiP is open." into oc-dev