Fix NPE on devices without Flash Light
Merge branch 'fix-npe-on-flash'