am 8a819016: am bd16ec75: Merge "Programmatically set selected state to correspond to peeking conv" into ub-gmail-ur14-dev

* commit '8a8190167285f35ae1c68d3b1471e9a2a964b29e':
  Programmatically set selected state to correspond to peeking conv