Merge "FRP: Fix crash after lockout" into oc-mr1-dev