Merge "Fix NPE on ActivityWindowInfo" into main