Merge "Fix NPE when creating dynamic shortcuts" into ub-contactsdialer-h-dev