Merge "Fix test name for Atrace 1.0" into qt-dev