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

* commit 'a0cb6d724ad0a23bc817ad3be8dd2e6906140375':