Bug 1025723 - [LockScreen][System] Change the old locking events with new window events
Merge pull request #20542 from snowmantw/issue1025723

Bug 1025723 - [LockScreen][System] Change the old locking events with new window events