Merge "Fixes background color issue in  private space" into main