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

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