Merge "Using WindowContext for listening to configuration changes" into sc-dev