MOBILE-710 notifications: Improve handling of foreground notifications