Merge "Display and wfd synchronization during teardown"