Merge "Forwards onConfigurationChanged for PiP on reparenting"