Merge "Add timeout to abort PiP if needed" into main