Merge pull request #9160 from mcirlanaru/bug_849718

Bug 849718 - Don't prompt for SIM PIN when opening lock screen camera, r=@timdream(cherry picked from commit f476a60daa5fc46e5b9caee2e021fc2b5b582eae)

Conflicts:

	apps/system/js/lockscreen.js