Merge "Try to fix Exception in windowLayoutInfo" into main