Merge "Add fallback to reset the waiting for transition state." into oc-dr1-dev