Merge "Include error logging for investigation on pushDynamicShortcut"