Fix conflicts at #1352 fix memory leaks and lint warnings (they happened due to hiding keyboard)

[neslihanturan]

Description

Fixes conflicts at #1352 , so that I can merge.

Tests performed

Tested on API 25, betaDebug

[codecov-io]

Codecov Report

Merging #1471 into master will increase coverage by 0.03%.
The diff coverage is 0%.

@@            Coverage Diff            @@
##           master   #1471      +/-   ##
=========================================
+ Coverage    3.21%   3.25%   +0.03%     
=========================================
  Files         132     132              
  Lines        7088    7196     +108     
  Branches      680     707      +27     
=========================================
+ Hits          228     234       +6     
- Misses       6845    6947     +102     
  Partials       15      15

Impacted Files	Coverage Δ
...n/java/fr/free/nrw/commons/auth/LoginActivity.java	0% <0%> (ø)	⬆️
...e/nrw/commons/category/CategorizationFragment.java	0% <0%> (ø)	⬆️
...free/nrw/commons/upload/MultipleShareActivity.java	0% <0%> (ø)	⬆️
...nrw/commons/upload/MultipleUploadListFragment.java	0% <0%> (ø)	⬆️
.../free/nrw/commons/upload/SingleUploadFragment.java	0% <0%> (ø)	⬆️
...fr/free/nrw/commons/settings/SettingsFragment.java	25.51% <0%> (-4.49%)	⬇️
.../fr/free/nrw/commons/utils/StringSortingUtils.java	73.91% <0%> (-1.09%)	⬇️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3c2cc26...d1fa26f. Read the comment docs.