Merge "Fix 5335993, calculate correct size of lockscreen buttons"