Merge "Add feature versions for devices and apps." into nyc-dev