Merge "Moving widget padding to drawable instead of using itemDecorator" into tm-qpr-dev