Merge "Update theme after overlay" into sc-v2-dev