Merge "Fixes the bug number for the Flash Notifcation flag." into main