Fix button state not syncing

Change-Id: Iee0649f51a1a565a724b99b6d2392a62d19de5fe