Merge "Fix drawing the ring around adaptive app icons" into tm-qpr-dev