Merge "Rename and remove duplicate layer creation functions" into main