Lock screen layout fixes.

Change-Id: Id341eea4062a45c9f71b8f04ccee378addd71c50