Merge "Also revert an apex update if it led to system boot timeout" into main