Merge "SF: Calculate WindowInfo frame correctly for all layers"