Merge "Change snap behavior for lock screen" into jb-dev