Merge "Fix monkey crash by guarding singleton initializing"