Ensure locking/unlocking is in the system app context
Merge pull request #295 from davehunt/fix-lockscreen-context

Ensure locking/unlocking is in the system app context