Merge "When dismissing PiP, don't set bounds to null if setting to FREEFORM."