Merge "Add static IP UI"