am da38055a: am 090f4149: am cc0086e4: am 1970614d: Merge "Restore parallax even if Google Now isn\'t present" into jb-ub-now-indigo-rose

* commit 'da38055ab3b1492c030c4cff96ecb91d78749896':