Merge "Use mWindowContext instead of re-creating to avoid stale Resource" into sc-dev