Merge "Lockscreen settings per user"