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