Merge "Adding custom manifest shortcuts in Settings app" into nyc-mr1-dev