Merge "Handle TaskStackListener.onPinnedActivityRestartAttempt in PIP system UI"