Merge "Fix QS expand on tablets" into nyc-dev