Merge "Hiding text from obscured text fields." into oc-dev