Merge "Reset top activity's mWaitForEnteringPinnedMode when aborting an incomplete pip-entry" into main