Merge "Removing unused ShadowDrawable" into tm-qpr-dev