fixed always callback with disabling buttons

Change-Id: Ib7ac171d8e0e5d395ade52cd2cabc20f8ac1855f
Merge "fixed always callback with disabling buttons"