Merge "fixed mIsReturning initialized too late. DO NOT MERGE." into lmp-preview-dev