Merge "Only handle last value change event for attached change screens" into stable-2.6