halo and lockscreen update

Change-Id: Iec0a9f1e498573042c6b91c4562769dfc78a8ce5