Merge "Set preference invisible when no anomaly" into oc-mr1-dev