Merge changes from topic "QT-SDK-Finalization" into qt-dev am: 917936172f
am: a17eabdc62

Change-Id: If2c086628f4a8f980acbb3f1e8a4f76cb8a1bbcf