Update for ButtonSettings from CM [1/2]

Change-Id: Ia7d4bdb53fc82b27000fcc6a25104089072fdf06
Merge "Update for ButtonSettings from CM [1/2]" into jellybean-mr2.1