Merge "Avoid screen edges when moving padlock"