Merge "Fix application launch shortcuts." into ics-mr1