Merge "Remove dependency on resizable activity to enter PiP."