Android back button behaves inconsistently in the new library

When I press Android "back" button, in the new library, it goes one level up and does not go back to map.

This is very inconsistent. Previously (in the old library), "back" went back from library to the main map view. In general, in all other views/tools I use, "back" goes to main screen or it closes a dialog and then goes to the main screen (or to where I was before).

The probably incomplete list of things where "back" closes a dialog/goes to main map:
1. Map-screen content menu

2. Quick map switch

3. Map themes menu
4. Online map downloader (well, there when one goes one level deep, it first goes up and then to the main menu, unless you define an area, when it goes straight back to map).

5. Add new point

6. Compass

7. Quick settings

8. Track recording

9. Route planner

etc.

Yes, sometimes like in the Store or Settings, "back" goes one level up, but in general you can only get to those screens by selecting something in the upper level, you cannot go to them directly. So "back" here means "go back where I was before".

One can get to library from several places (online downloader> select a track, or going straight ot the library via the main menu or from panel). I would definitely expect to use "back" to go back to where I was. Yet it goes one lever up (I definitely was not there!) and only when I get all the way up, it goes back to where I started.

There are several solutions to this:

1) (The best) Remember where the user was previously. When I go to my library from the main view, "Back" goes back to "main view". However, when I change a folder, first go to the previous folder and only then go back to the main view. That way, "back" always takes me where I previously was and does not take me to any surprising places.

2) Have back always go to where one originally came from. Either change the close button to "go up one level button" or not (or add taht button, but given folders are clickable breadcrumbs, this is probably not so much needed).

The close button being on top is not very usefel. When using the app with one hand, I cannot reach it. I often change the visibility of a folder in my library and the new UI makes it awkward.

Please not I have spend several weeks hiking since the new version, I use the library a lot and I still have not learnt to use the close button. I sometimes do, but most often I just mindlessly press the back button. Its functionality elsewhere meaning "go back where I was previously" is so strong and overrides any possible musle memory to use the close button in My library. If the behaviour was consistent, I could relearn, but the current state of affairs just brings me constant frustration. Even while writing this post and checking that what I say about the app behaviour is true, I would do this mistake to go up all the levels to leave the library. I must be extremely vigilant not to do it. If the UI cannot be changed, please make this a setting at least. However, I really think this UI is bad as it breaks patterns from elsewhere in the app (and general Android patterns - "back" usually goes "back", not "up".

Better aproach would be to replace the "x" button at the top with a back button that would apply to going up one level and keep the main app button consistent with everything else in the app.