Merge "Apply theme in single transaction" into sc-dev