Merge "Choose thread icon more carefully" into ub-gmail-ur14-dev