144 hour visa free transit in Shanghai ?

We are Canadians and fly from Vancouver to Singapore on 3/14/2019 with a 3 hour stopover in Shanghai where we change plane.
On our return from Singapore to Vancouver, we stop for a holiday in Shanghai (5 nights) from 4/1/2019 to 4/6/2019. Would we qualify for 144 hour free transit? Thank you.