Merge "Fix density change bugs in SystemUI" into nyc-dev