Merge "Enhance static IP UI"