Fix LockscreenSettings crash on tablets

Change-Id: Ib957215679ca5c889c172be30192de48bb126b5c
Merge remote-tracking branch 'upstream/kk4.4' into kk4.4