Aware and AB use storage directly instead of userPrefs.
Merge branch 'master' into cleanup-prefs-use
Merge pull request #818 from guardian/cleanup-prefs-use

Aware and AB use storage wrapper instead of userPrefs