Merge "Update vis of deviceEntry longpress view based on icon's visibility" into main