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

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