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

Change-Id: I3b3a3144a8c8bb5f848239d30feb7672148b63c4