Merge "Replace invis drawable when ConstantState null" into main