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

Change-Id: Iadb3c2ef9dbb0863559d805fb2692dc8d6adcda5