Replaced degree code with char, joined import line.

Cherrypicked from PLi.
Increase time out on resuming movie.
Merge branch 'Dev'