Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions"