More long-term pass holders to be allowed into Singapore, swab tests a must towards end of stay-home notice