Merge "Revert "Stop idmap2d after several seconds pass"" into qt-r1-dev
am: 4b09d08c6c

Change-Id: I7e6d5d4f5245319fc3fcbfe27c16f11ad80eb9c2