Merge "Add null check before using mHeadsUpManager"