Merge "Fix density change bugs in SystemUI" into nyc-dev
am: 67b98daaa4

* commit '67b98daaa42d10282f263ce27ca81a42b14413ff':
  Fix density change bugs in SystemUI

Change-Id: I4b1287302ff63ac66962ee233a43cbd2aae875ac