Merge "Fix SysUI-Assistant metrics logging" into qt-dev