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