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

Change-Id: Ib9534d716845a792a67bb7745193c88510929ecb