am e187441b: Merge commit \'703169a3\' into manualmerge

* commit 'e187441b9b9b760a21da7c80b49c61f85eaec8e4':
  Don't wait for finishing animation when second display is disconnected