Merge "Fix for no error dialog for the first time error"