[master] The LayoutIndicator widget and minor fixes