Merge "Use ConstantState directly instead of ConstantStateFuture"