Merge "Increase number of lines before the fold to make sure Now Playing is visible." into pi-dev