Merge "Clear pending operation flag when move failed." into lmp-dev