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

Change-Id: I7385de6ba8f0523bc7b065424ffaa243cfda8177