Merge "Do not stop lock task if it is starting background user" into oc-dev