Merge "LockSettingsService: clear gatekeeper state when removing user" into tm-dev