Merge "Removing support for legacy shortcuts from default layouts" into udc-dev