Merge "Remove work around for driver state change"