Bug 929921 - [Settings-Passcode] Screen Update
Merge pull request #13045 from pivanov/bug-929921

Bug 929921 - [Settings-Passcode] Screen Update