Decouple recurring and one-time queue processing

Change-Id: I10cd9a092476deb5d2c50ea73d8cbdf70fbffedf