Merge "Disallow drag and drop of an activity from triggering autoenter PIP" into main