Merge "Merge changes from topic "ActivationType" into qt-dev am: 266b90d80e am: ec40157881"