Merge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev