Merge "Null check while removing suspensions" into rvc-dev