Merge "Show the H+ icon in HSPA+ network" into pi-dev