Layout data should not override page data

Fixes #1934.

I removed the code that merged the layout data with the page data (while letting the layout data override the page data). I do not think layout's should have data. But in the case that assumption is wrong, another feasible patch would be: