Merge "Fix the art work of lockscreen cannot be removed" into pi-dev