Merge "Pass WindowContext to DisplayInfoChangeListener" into sc-dev