Merge "Custom dark theme scheduling"