Merge "Fixed too much padding in QQS with top corner cutout"