am e88820c1: am 2ee89803: am 710d192e: am 5cca407d: Merge "Fix message starring via overflow" into ub-gmail-ur14-dev

* commit 'e88820c1696d760de99db10d41bd3f0c5c6cdc6d':
  Fix message starring via overflow