Merge "QS: Don't expand header in paging prototype"