Fixed rotation crash by refactoring MenuFragment
Merge remote-tracking branch 'origin/master'