Merge "Fix margins/padding in widget picker" into tm-qpr-dev