Merge changes I24a9d34d,I443e9d2b into nyc-dev

* changes:
  Add default app prefs to app info
  Rearrange configure/default apps