Merge "Fix overlapping problem in AlertDialog" into qt-dev