am 0a3a387a: am 6d61faad: am d64744cc: Merge "Help out with issue #11497149: Clock app crashes when opened during..." into klp-dev

* commit '0a3a387a46720cdbd4fcccbe55ac24d1f385fece':
  Help out with issue #11497149: Clock app crashes when opened during...