Merge "Re-adding missing lockscreen drawable"