Merge changes Id1aab629,Idb24dbd4 into nyc-dev

* changes:
  Fixed a few issues when adapting the dpi
  Fixed a few issues with status bar density changes