Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev