Merge commit '899858a39647803c0cb506d2320fdaf2e4d3b8b9' * commit '899858a39647803c0cb506d2320fdaf2e4d3b8b9': Partially fix bug 2111240 Detect docking / undocking event by reporting
Merge commit '899858a39647803c0cb506d2320fdaf2e4d3b8b9' * commit '899858a39647803c0cb506d2320fdaf2e4d3b8b9': Partially fix bug 2111240 Detect docking / undocking event by reporting