Update for ButtonSettings from CM [2/2]

Change-Id: I861243278dd52cd5d6e4acfc9cb49d26f8b5f42b