Merge "Remove extra padding above Access point names in Mobile network of Settings" into pi-dev