Merge "Only clear selection if select size larger than 0"