Merge "Update Layout.Builder APIs" into main