Visibility is not correct for Demand Driven Mode Change-Id: I05a4b91813622a0c584bd5495d6f547ae921a1cc