Merge "Fix some dark theme issues" into mnc-dev