This fixes a number of bugs in the layout file for lockscreen. Change-Id: I58f66389939e91e8e2184940d6824e0fe0650986