Merge "Fix dark mode for custom views" into mnc-dev