Merge "Improved lint integration in the layout editor"