Merge "Don't add floatingMaskView if it will not fit." into main