Merge "Still check the visibility of view"