Merge "Add build number to apps' version name for non-platform build" into nyc-dev