Merge pull request #13867 from timdream/lockscreen-unlock-transition3

Bug 937630 - All you need is ... smooth unlock transition, r=vingtetun
(cherry picked from commit 45f65f707ae1d724c48c4ebf439d1617c35bbe42)

Conflicts:
	apps/system/js/lockscreen.js