Merge "Workaround Button disabled state on v21-22" into mnc-ub-dev