Merge "Don't wait for finishing animation when second display is disconnected" into klp-dev