Merge "Merge "Fix drawing the ring around adaptive app icons" into tm-qpr-dev am: 37e943894d am: 172d20b774"