Merge "Set preference invisible when no anomaly" into oc-mr1-dev am: 0e800978bf
am: fb13cac59f

Change-Id: I9a851fc886abb1489b8133468aed2c0548ffbd2d