Merge "Rename layout -> blueprint and add "sections"" into udc-qpr-dev