Merge commit '5417933a456f23a0ca30bb73632feee5dd5f8e46' * commit '5417933a456f23a0ca30bb73632feee5dd5f8e46': Fix issue #2286419: maxSdkVersion causes existing apps to disappear.
Merge commit '5417933a456f23a0ca30bb73632feee5dd5f8e46' * commit '5417933a456f23a0ca30bb73632feee5dd5f8e46': Fix issue #2286419: maxSdkVersion causes existing apps to disappear.