First commit
Merge https://github.com/nmmcdona/ContinuePlayingOnLock

First commit