If you are in AOS, you need AP to come back no matter from China or Canada. If your H1 is still valid you may not need AP.