Merge "Ensure we only remove messages for the same app info" into qt-dev