Separate stable and beta upload overlay code

And remove the nag overlay from beta.

Change-Id: Iab91e7b061214fff3406c87e09ff2686ed788495
Merge "Separate stable and beta upload overlay code"