Merge changes from topic "sf-kernel-idle-timeout" into qt-dev am: 0e7098cf53
am: 1fe71429a8

Change-Id: If907eefa037d97153e474cdfcb84a6dc948e436f