Merge "Prevent clock becoming visible when icon disabled"