Merge "[automerger skipped] Merge changes from topic "cleanupkeepalive" into qt-dev am: c31ccecf6c -s ours am: 223535d862 -s ours am skip reason: change_id I0481a469ee23231e5f0ab738a06b5e09f6cdb680 with SHA1 cf43dbdbc6 is in history"