Merge "Centralise time to full in SettingsLib" into main