Merge "Fix use of auth-bound keys after screen lock removal" into oc-mr1-dev