Merge "Removed afm.notifyValueChanged() optimization."