Merge "Revert "Stop idmap2d after several seconds pass"" into qt-r1-dev