I would bet on 2 – if things will happen as it looks now. So far, everything in the IC5-ACP looks as if nothing has happened with Pages except for the Page Builder. They must still have something in development. All other templates (category, article...) still look as bad as under IC4. Or I haven't understood it yet.