Merge "Change context to WindowContext for non-activity window" into sc-dev