Merge "Check for screen aspect ratio when picking layout of QS media card" into main