Merge "Wait display be destroyed before closing session" into qt-dev am: 3dc080c6f3
am: 9f14b27a08

Change-Id: Ied2b25926f3e028a263a8bb590b8363fd7bac062