Fix bug with non-secure gesture lockscreen

Change-Id: I8d5f2be117f0609adeb1b8a3705bd9d3be5dc137