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

Change-Id: I10d605fc4bc7eb0dc60a2927ebd6840463866b0c