Merge "Fixing NPE before calling unbind" into main