finish screen/leaderboard screen transition fixes
Merge remote-tracking branch 'origin/master'