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

* commit 'a89904223770a43d4c2e5ecd26400ed8f1db68df':
  Fix dark mode for custom views