Merge "Fix taskbar instrumentation crash" into tm-qpr-dev