Merge "Fix crash from PipMenuActivityController when auto-pip's enabled"