Merge "Add help url placeholder for SimLock settings" into oc-dr1-dev