Merge "Flash Notifications color dialog crashs if configuration changes" into main