[avsettings] merge revert commit from openatv