Merge "Remove ability for user to open wallet directly within shortcuts disabled dialog" into udc-dev