Fixed Compiling error & Overlay for Lockscreen

Change-Id: Ib1379fc03e0b5e143bb841b68f1e33342201456b