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

Change-Id: I88068eef2e15363648a4d3026ad493ab3d089fc9