am ad6df987: am d6a7a26d: am d59c1f83: am 50259c70: Merge "Tune layout parameters of setup wizard"

* commit 'ad6df987ac3910913d7517e0deff914f23ab4ea3':
  am 50259c70: Merge "Tune layout parameters of setup wizard"