Merge "Create the Note Task shortcut using the SystemUI Context" into udc-dev