Merge "Update secondary lock screen implementation to use the newly updated SurfaceControlViewHost API."