Merge "Hide categories to avoid taking up extra space" into main