Merge "Fix 3201849: Use custom Drawable for bg in lockscreen" into honeycomb