LPS-33892 only add layoutSetBranches when they don't exist