Merge "Fix notification background color" into sc-dev