Merge "Fix QS size on 320dp with big fonts" into oc-dev