Merge "Do not stop idmap2d after OMS initialization" into qt-r1-dev
am: 3186b40edf

Change-Id: I0374997faf945a2cd60179cf1c35a7fbcd255285