Merge "Fix issue #10427108: Google+ has long running process" into klp-dev