Merge "Skip idmap1 generation if target defines overlayable" into qt-dev am: facddb4508
am: bc3244400e

Change-Id: Iae68191ff306c57f9a8b0a1ce5e73c89ffffb54d