Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev