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

Change-Id: I55006fe0d94a6a80574437c7b4a55c261013a2bf