[LockScreen] Merge two v1.2 approval patches.

Include two patches:
1. Bug 925635
2. Bug 923788