Merge "CDD: Update screen aspect ratio requirements." into qt-dev