Merge "Prevent screenshot UI from being removed if only one screenshot fails" into main