Minor refactoring

Move the identical function calls outside of the if-else block.
Don't update overlayCaches if just one point is displayed

This fixes a race conditions between doDisplayRun() and displayPoint()
which caused the wrong waypoint to be displayed.
Update Intellij IDEA file
fix #4236: no activity found to handle intent
Merge branch 'release' into upstream
Fix more activity problems (#4236)
Merge branch 'release' into upstream
Upgrade to RxJava 0.20.1
Update Intellij IDEA file
Merge branch 'release' into upstream
fix #4233: avoid NPE if showcase view target is not found
#4234: avoid exception with no dimensions for showcase view
fix #4245: IllegalStateException with NFC

Setting the Ndef record creator in onCreate() is the recommended way to
do it. A null can also be returned if no message should be created.
Merge branch 'release' into upstream
Correction for fix #4245: allow null uris
Merge branch 'release' into upstream
crowdin: New translations
Merge branch 'release'
Ice Crem Sandwich phones do have NFC
fix #3569: concurrent modification when filtering caches on map