7 Years Ago
Cherry pick merge in some extra changes so the bootstrap scene gets made active reliably