Merge "Fix keyguard elements showing during dream->hub transition." into main