Merge "Prevent shortcut access when user is locked" into nyc-mr1-dev