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

* commit '995c05973b45aa526528ac1b2cde84fba04db996':
  Fix density change bugs in SystemUI

Change-Id: I29002680836ce60e161beb09dc84c4f124a9cbdc