Merge "Shortcut crash fix" into udc-qpr-dev