Merge pull request #11568 from mcirlanaru/bug_899236

Bug 899236 - [Lockscreen] Reintroduce camera button for... r=@alivedise(cherry picked from commit 86d7d11b4637977b4131845b311e4348fb42d131)

Conflicts:

	apps/system/js/lockscreen.js
Merge pull request #11620 from mcirlanaru/v1-train_bug_899236

Bug 899236  - [Lockscreen] Reintroduce passcode screen camera button [v1-train uplift]