Merge "Merge "Do not stop idmap2d after OMS initialization" into qt-r1-dev am: 3186b40edf am: 37e74a8420" into qt-qpr1-dev-plus-aosp