I don't think they will wait 6.0 to make some changes.
They have always been good at taking user feedback and seeing how they can be implemented.
I don't see why they would change that now...