Merge "Handle showWhenLocked on secondary displays"