Merge "Make suggestions header sticky in widget picker two pane" into udc-dev