Merge "Fix issue #2950374: Fragment#setHasOptionsMenu() doesn't work..."