am b9f31c6b: Merge "DO NOT MERGE Fix vanishing title/url in window picker" into gingerbread

* commit 'b9f31c6bdc9fb20c88b8f6cf4a39f627fa228a83':
  DO NOT MERGE Fix vanishing title/url in window picker