Merge "Fix issue with white and black themes"