Merge "Reducing number of configuration changes during PiP transition."