Merge "Update settings to reference correct versionCode" into pi-dev