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
am: 7497b700

* commit '7497b700':
  When app is updated, save the new version code, and update shortcuts with resource based icons.

Change-Id: I9652000c76fc495b9bf65692cd27b96df7a11cce