2135: Do not use webfonts for the pre-loader, else preloading text will be empty at first, also a bit of refactoring on the modal controller

This was started by Arthur, and commited by Ben.  I reformated the
scss file so that the diff had less changes in it, but syntactically
it should be the same.
2135: Only load popcorn video player after application bootstrap

Taken from Arthur's work in 20ee07e1656b27ed79a5864ccb28443ea517cf62
Fixes for locking code.

My previous changed made us try to regain the lock multiple times
after the timeout.  This makes things work like they did before.