Merge "Fix request layout propagation in layout tree" into devel/master