Changes made to handle correctly the show of the current location when rotating the screen