Merge "fixed mIsReturning initialized too late."