Merge "When app is updated, save the new version code, and update shortcuts with resource based icons." into nyc-dev