Merge "Fix the broken popup layout in text field example" into devel/master