Merge "Simplify AbstractFloatingView.closeOpenViews usage." into tm-dev