am 9adc436f: am 4824817c: am 8503de7f: am 46b03764: Merge "Reset action bar icon on showing conversation" into ub-gmail-ur14-dev

* commit '9adc436fd265534e9d940f9820dbc729cac548ef':
  Reset action bar icon on showing conversation