Merge "Remove animations in WifiSettings." into oc-dev