Merge "If deviceEntryIconView isn't visible, clickable=false" into main