Improve lockscreen support