am b91fda48: Merge "Use only one view type for compose from spinner" into ub-gmail-ur14-dev

* commit 'b91fda486f500a219edf898f15a082a6a01c2c1c':
  Use only one view type for compose from spinner