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

Change-Id: I787f0f6f324b38484d1e57ca88f28fb57c5f09c8