Merge "Update ActivityWindowInfo from app window resizing" into main