start addressing review comments again
Merge branch '1027898-contentprefs-e10s' of github.com:mrbkap/gecko-dev into 1027898-contentprefs-e10s