Merge branch 'b2g' into dev
docs
fix settings so regressions are identified
capture settings
update settings
remove unused line
Merge branch 'dev' into b2g