am 9d96c776: am 20c3e580: Merge "Combine conv and misc panes into one frame and animate that instead" into ub-gmail-ur14-dev

* commit '9d96c7765a97f92a2f8a66dcb6d0282b2bbd1d59':
  Combine conv and misc panes into one frame and animate that instead