Merge "Use correct UID for network setting menu"