Merge "Always contain window frames in window bounds" into main