Modifications to alpha mask exception for png with uniform rgb values.

User wasn't happy with the previous work around, so this will hopefully
be closer to what they expect with regards to behavior.

BUG:445691