Merge "Fix UI issue with expanding details."