Merge "Fix NPE when creating dynamic shortcuts" into ub-contactsdialer-h-dev
am: 334bc5fdda

Change-Id: I2e4f895f18c745917c404aa165a8cec701bb255d