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