Merge "Fixes for ending PiP animation." into nyc-dev