Merge "Make setDrawable work after initialization has occurred."