Merge "Add support for graphics.mapper@3.0" into qt-dev
am: f182d3ae5b

Change-Id: Id96445f3a4b6810eb1ba49134d2af59ac6eb9b83