Merge "Fix clip calculation for disabled clip bounds" into main