Merge "Fix wfd crash after disconnect due to null pointer exception in"