Merge "Do not stop idmap2d after OMS initialization" into qt-r1-dev