Merge "Merge "Stop idmap2d after several seconds pass" into qt-r1-dev am: aa22db3da7 am: 55189157a9 am: 002b418d3d"