Merge changes I0fde4f80,Iea1cff48 into pi-dev

* changes:
  Update TimezoneInfoPrefController to register in xml
  Make FontSizePreferenceController slice compatible.