Fix(Safe upgrade): preserve fallback handler + show queue warning only for <1.3.0

Fix(Safe upgrade): preserve fallback handler + show queue warning only for <1.3.0 #16038