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

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