Merge "Update for shortcuts" into mnc-dev