Merge "p2p: fix popup theme to adapt night mode" into sc-dev