Merge "Fix color filter on NotificationExpandButton's chevron" into sc-dev