Merge "Fix wrong widget appearing in widget picker for tablet" into tm-qpr-dev