am 40602179: Merge "Default icon is shown after uninstalling updated priv-app"

* commit '4060217905d805897141b028126e0aa51136cf7b':
  Default icon is shown after uninstalling updated priv-app