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

Change-Id: Ia93df2d63161923aa0563159f86d6238ea1f27d7