Merge "Refresh cached user array upon lockscreen settings changed" into nyc-dev