Merge "Fix all usages of deprecated setBackgroundDrawable." into nyc-mr1-dev