Merge "Fix data usage under Wi-Fi has title "Mobile data usage"" into pi-dev