Merge "Fix size of last page of QSPanel"