Merge "Partially revert the decor bounds calculation" into main