Fix app selection pagination to work past the second page (bug 1041719)

r? @ngokevin @spasovski

The real bug was `app_selector` vs `app-selector`, but I did some refactoring while trying to figure it out that I liked, so I kept it.
Unrelated fix.