Merge changes If93e3975,Ifed45f06 into main

* changes:
  Fix views being visible after closing private space.
  Set attach consumer after animation finished