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

Change-Id: Icd54b27f024011a259f39bdcd11ac3712876c4d3