Merge changes from topic "am-037b493cda424ced9667438be1e9704d"

* changes:
  [automerger skipped] Merge "Fix potential crash when exit splash screen" into tm-qpr-dev am: 58db7ce171 -s ours am: 9884951441 -s ours
  [automerger skipped] Fix potential crash when exit splash screen am: 18646d5860 -s ours am: 8d311085f5 -s ours