Improve button display in flyouts

Change-Id: I480733a504f67772713f50f5b44877057dd65134
Merge "Improve button display in flyouts"