Merge "Fix SysUI crash when launching Chrome from app shelf"