Merge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-dev