Merge "Fix crash when a shortcut update for notes happens before user unlocked" into udc-dev