Merge "Widget picker closes and reopens when switching orientation on phones when it's not necessary" into tm-qpr-dev