Merge "Add theme to widget mask to have light/dark mode" into sc-dev