am 45c57dcc: Merge "Fix SubtypeSwitcher incomplete initialization" into jb-dev

* commit '45c57dcc2dd0eeb0c7e9672d5cada7f6e368235c':
  Fix SubtypeSwitcher incomplete initialization