Fix merge conflict and wrong constant name
Fix merge conflict and wrong constant name

1. Fix merge conflict after pull upstream codes
2. Wrong constant name correction

moaazsidat/react-native-qrcode-scanner