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