Merge "GUP: Add stub UI"