Merge "Settings: Fix QrCamera crash on devices without flash" am: 68ddb3afdb
am: 748ee1657f

Change-Id: Ic64d2c3a36939751891440639b5114a9df3fd184