Merge "WM: Prevent secondary display focus while keyguard is up" into pi-dev