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

Change-Id: I881f96dc669b8e974e0912240bd227e84558d70a