Merge "Updating Drawables as per GraphicsUtils changes" into tm-qpr-dev