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

* commit '73bc3fe2d1cfeefe3642709c7cc2e87334e71e92':

Change-Id: Ib3713f2afff339f58ad5e206cd561db5dff074af