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

Change-Id: I61694ca762aed50719423905a14a33993511a630