Merge "Add flag for 'Improve widget picker UX on large display form factor'" into tm-qpr-dev