Merge "Use 32dp as the content margin for widgets pickers in large screen devices" into sc-v2-dev