Merge "Check if a visible layer exists instead of an invisible layer exists" into oc-dev am: 3fdeae8b2d
am: 7090b928fe

Change-Id: Id34dceb965b5c969bed1902a60696f70fc2101ae