Merge "Inaccurate auto dark theme time"