Fixed interfaces configuration: control buttons state

Change-Id: Id2790ab76a194249734d01bd58a6ff92a621369c
Merge "Fixed interfaces configuration: control buttons state"