Lock Screen Fixes

Change-Id: I84baed2095c1e7b3be1e550a31c3a50865666b1e