Merge changes Ib59efe76,I316e3649

* changes:
  Move RadioButtonPreference to generic widget package
  Another attempt fix for account preference screen.