Merge "Swallow exception from failed idmap2d disable" into sc-dev