Don't load title from intent if title loaded from DB

Title for shortcuts, when creating workspaces, are loaded from the
intent rather than the title stored in the DB.  The title from the
DB is loaded in the ShortcutInfo so we will use that unless it is
null, in which case we'll fallback to loading the title from the
intent.

Change-Id: I436c11062dbc8ff3d7e1cd9f9564321ad0476933
(cherry picked from commit e9639328)
(cherry picked from commit 34dbd4ad)