Merge "Fix theme change notification" into sc-v2-dev