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

Change-Id: I7d50bbbba464b0ef87ce96a81ebcd5c51c6eb78d