Merge "Fix 5233681,5230897: Minor tweaks to lockscreen layout on tablets."