Merge "Fixed issue with dark/light mode theme updates" into main