Merge "Initial layout of selection toolbar."