Merge "Apply Dark theme changes when screen off only"