Merge "Do not set guts visibility to transient state" into qt-qpr1-dev am: 4bcd36661d
am: 91ab7bfca6

Change-Id: Ia15f7a8364e7467a90e4ccb0bdc752f7b9448861