am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart...
am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev
* commit 'f696efa2':
Fix issue #17948584: Application crash and phone restart when app...