Merge "Remove unused layout"