Merge "Don't log spurious standby bucket changes during startup" into main