Merge "add null check to copy selection" into honeycomb