Merge changes I7c303e66,Idc03b9d3 into main

* changes:
  Add floatingMaskView when animating to mimic bottom container.
  Add private_space_floating_mask_view flag.