Merge "Fix empty state layouts"