Move call to updateButtonLayoutWidth to recreateButtonLayout()

Change-Id: If547451382fb7c376c498545948dde4cfcf9cc31
Merge "Move call to updateButtonLayoutWidth to recreateButtonLayout()" into jellybean-mr1