Merge "Fix resource leaks in layouting." into devel/master