Fix CustomLayout: component not added at the default location (#14340)

Change-Id: I5eb76915b52f6b73ff0799631d98d5711041eeb5