Merge "Introduce ActivityWindowInfoChangedListener" into main