Merge "Replace drawRect with drawable for delightful pagination" into tm-qpr-dev