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

* commit '3c8a439be33932f35b723271cec5cd4210c19221':
  Fix issue #17948584: Application crash and phone restart when app...