Merge "Fix for a11yManager package force stop" into main