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

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