Fix issue with showing correct order state during amazon payments checkout