Merge "Move Note Shortcut from Settings to SystemUI" into udc-dev