Bug 965386: Readd no-transition class when coming back from camera panel
Merge pull request #15854 from qdot/965386-no-status-time-after-lock

Bug 965386 - Make unlock always fire when passcode correct