Merge "Fix stack memory accounting for dumpsys" into qt-dev