Merge changes from topic "landscape-jeeze" into qt-qpr1-dev
am: 7943c7b5ab

Change-Id: If8275df4e70a2fac55e9aaaa5c35ff7db3ab096d