Merge "Reset PiP leash crop upon remove" into main