Merge "Merge "Double tap to expand PiP." into oc-mr1-dev am: 2a6f25b995" into oc-mr1-dev-plus-aosp