E-cigarette use to be restricted, flavoured tobacco to be banned in Ontario