Merge "Make sure re-published dynamic shortcuts are always enabled" into nyc-mr1-dev