Merge "Include Light/Dark theme support in player integration" into main