Merge "Deprecate Mapper 2.0 from Q launching devices" into qt-dev
am: 3f99e1db08

Change-Id: I9e90e8b63a256a07ce55aba6100174a4d80964d1