Merge "Do not draw icon background if it shouldn't be seen" into sc-dev