[automerger skipped] DO NOT MERGE Change the logic of ContainerLayer's isVisible()
am: fe2975eff2  -s ours

Change-Id: I3ad7f2238ba1bdbb235f141e78e02a80c4889ae5