Merge "Support IMapper@3.0 in OMX VTS" into qt-dev