Merge "Fix UI behavior"