Merge "Add back widget drawable"