Merge "No autofill password when in PIN settings" into oc-dev