Face masks in England to become 'matter of personal choice'