Merge "Set appropriate margin to dividers in SetupWizard" into honeycomb