Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev