Merge "Fix idmap enforce overlayable bug"