Merge "Now Playing is too low on the lock screen" into tm-qpr-dev