Prefer the locally provided ActivityId

[ryangadams]

We've swithered about this back and forth, but the LMS plugin we're testing against doesn't pass the activityID in the url so we should look for a local value first.

[ryangadams]

Page level progress wasn't being updated when the course loaded because the stateLoaded event was firing but nothing was listening to it.

[barry-mckay]

+1

[ryan-lynch]

+1

[brian-learningpool]

+1