Merge changes Id1aab629,Idb24dbd4 into nyc-dev
am: 1ed0c12

* commit '1ed0c12a657eb3f569cfcc5329ef4532e83d0f87':
  Fixed a few issues when adapting the dpi
  Fixed a few issues with status bar density changes

Change-Id: Iba70347a8fa9ea1f22e236e9c1f1d388e1c4d772