Merge "Double tap to expand PiP." into oc-mr1-dev