Merge "Add finish logs for AppTask finish() paths as well" into main