am c79343ce: Merge "Fix SysUI when an app started from the affordances crashes" into lmp-mr1-dev
automerge: 57b440e

* commit '57b440e206f142368bcf42885d3f3763554173e8':
  Fix SysUI when an app started from the affordances crashes