Merge "Don't disrupt a11y state when user is unlocked." into nyc-dev