Merge "Fix dot/icon overlap in notification shelf" into tm-qpr-dev