Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev