Merge "PIP: Fix crash when the PIP menu activity is started by intent"