Merge "Update manifest shortcut XML schema" into nyc-mr1-dev