Merge "Removing support for adding legacy shortcuts." into udc-dev