Merge changes from topic "user_templates" into qt-qpr1-dev
am: 8959c2dd6b

Change-Id: Ifef51d385f3a998ae958214bb8a51c285d7f5d78