Merge changes Idf05ffee,Ie7371ba4

* changes:
  Update "More" button text to "Advanced"
  Fix NPE when adding account but prefManager doesn't exist