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

Change-Id: I91802afbc807abbd07d75b0aa26adda240ba4082