Non-essential retail to reopen from April 12 under coronavirus roadmap