Merge "Fix QS to not be completely broken on landscape"