Merge "Only show headers in Master Clear when there are multiple profiles"