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

Change-Id: I6148e5c17756a2f8e5690a88b7b79f897b629b51