Merge "Fall back to default custom shortcuts if custom shortcuts are disabled" into udc-dev