Merge "Initial changes to support expanded PiP"