Merge "Small fixes and tweaks to PiP transition."