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

Change-Id: Iab4ef00dedbf4642fd024ea4c867bd85b080254c