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

Change-Id: I99ec64ace7a5fc247ee1f5c4e1353d4cfbe8ed72