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

Change-Id: I8b18b2965a75278264587831c24ead01f4c126cd