Merge "Fix regression from ag/6938053 where the pointer is in wrong place" into qt-dev