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