Merge "Fix one more import for ContextThemeWrapper." into sc-v2-dev