[automerger skipped] Merge "Add support for graphics.mapper@3.0" into qt-dev
am: f182d3ae -s ours
am skip reason: change_id Iaa7a3f06956f9f81b3d4338bbf32fea282cdd511 with SHA1 d032f2df is in history
Change-Id: I874fdf736c707abc044330074753d2ad20e6c648