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

Change-Id: I0e3f1ec5f9e7142e9b802f96f7853a2a42045cb9