Merge "Fix apn option display issue for world phone mode"