Fixed prefrenced + finishing activity after returning from the settings activity
Merge remote-tracking branch 'origin/master'