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

Change-Id: Ie0ad5e7b5231d46fa7a70549e47551e2f20eaaa7