Merge "Add Keyguard Shortcut for Note Task" into tm-qpr-dev