Merge "Check if a visible layer exists instead of an invisible layer exists" into oc-dev