Merge "sysui: fix navbar button view orientation" into nyc-mr2-dev