Merge \\"Make sure re-published dynamic shortcuts are always enabled\\" into nyc-mr1-dev am: 7df9ce075f
am: 39e24512a1

Change-Id: Icfb06157a5fda86708c5a56afe9491ad902caaae