Merge "Update lockscreen assets" into ics-mr0