Merge pull request #5095 from koying/fixdroidappcrash