Merge pull request #10358 from Simonx22/android-back-button Android: remove save icon and add up button
