Merge "Revert choose lock header file to non-setup theme" into oc-dev