Merge "Fix overlapping problem in display size screen." into qt-dev am: 8416839234
am: 56c774de19

Change-Id: Id33006b0b5faa3c583b1d1cfdbe0283f34107562