Merge change Ie552036f into eclair

* changes:
  Fix issue #2286419: maxSdkVersion causes existing apps to disappear.