Merge "Change the long-press behavior on custom shortcuts to utilize an actual long-press" into udc-dev