Merge "Check parent frame instead of window bounds" into main