Merge "Fix bug #8487785 Notification shade has text overlapping the icon" into jb-mr2-dev