Merge "remove activation button from preferred NW setting"