Merge "Handle showWhenLocked on secondary displays" into oc-mr1-dev