Merge "Handle PHASE_BOOT_COMPLETED asynchronously in LockSettingsService" into main