Bug 1060838 - handle rejections for sdk/addon/runner's use of require('../preferences/native-options').enable()
Merge pull request #1603 from erikvold/1060838

Bug 1060838 - handle rejections for sdk/addon/runner's use of require('../preferences/native-options').enable() r=@jsantell