Merge "Fix GAR color constrast issue on dialog" into sc-dev