Merge "Create a bug fix flag for the FloatingMaskView." into main