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

* commit '8503de7f4061e1fffb7878c64783dc9f1fd8cb97':
  Reset action bar icon on showing conversation