Merge "Inline slider with header" into pi-dev