Merge "Remove show/hide API"