Spoken French uses "on" exactly (Well, not exactly but close) like we use we. But they still use "on" in the traditional way to be the all-encompassing you.

I don't think anything is rising up right now to take its place. You just make the distinction from context.

See what I did there? Lol