[fixed] mantis 4198 closed extraneous fishing menus
[fixed] mantis 4198 closed menus during "reel in" state

Change-Id: Ie09a621106f3ee366c2cb041627c3812cf15290e
[removed] free bait when starting to fish without bait

Change-Id: I3b1ada40a216eb0f0064825462789e4743915aa9
Merge "[fixed] mantis 4198 closed extraneous fishing menus [fixed] mantis 4198 closed menus during "reel in" state" into unstable
Merge "[removed] free bait when starting to fish without bait" into unstable