Merge "Break the dependency between non-persistent user and shortcut users." into sc-dev