"Next" button often takes a long time to appear

Change-Id: I0ced010d9c646d4f50861c5bb6bd446e8be6c404