Merge "Maybe fix #2925641: calling onCreateOptionsMenu before attached activity"