Merge "When app is updated, save the new version code, and update shortcuts...
Merge "When app is updated, save the new version code, and update shortcuts with resource based icons." into nyc-dev
am: 711ffe62
* commit '711ffe62':
When app is updated, save the new version code, and update shortcuts with resource based icons.
Change-Id: I29e9cd4684fbc5fc688aa02ee28f8af4d6c58556