New EV policy to focus on bike subsidy and charging infra