merged with latest from upstream/master
Merge remote-tracking branch 'origin/preference_screen_reorg' into preference_screen_reorg