Merge "sysui: update sw900dp navbar sizes" into nyc-mr2-dev