Merge "Do not check user escrow state if synthetic password is not enabled yet" into oc-dev