Merge "Ensuring that we remove the input consumer after moving expanded PiP"