Merge "Disable invalidation tickle workaround on M+" into mnc-ub-dev