Merge "Convert BypassHeadsUpNotifier to use CommonNotifCollection."