Merge "fix(magnification): fix NPE from using deprecated instrumentation" into main