UI fix custom list fix size and height.
Merge remote-tracking branch 'origin/master'