Merge "Bring Widget Picker message style inline with All Apps message style." into tm-dev