Merge "QS: Fix single expanded frame from layout" into nyc-dev