Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev