Merge changes I29d00f22,I9337e226

* changes:
  Added a hack for NUI because of a dependency cycle.
  Use application context when fetching shared prefs.