Merge "sysui: update sw900dp navbar sizes" into nyc-mr2-dev am: 2d6accd7a9
am: 77215beb95

Change-Id: I395eba88b3ff9d65932273aa3eef599ebfca3979