Merge "Fix overlap between operator name and heads-up notification"