Merge "Add a better notification test and clean up the flag handling in the notification builder."