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

* commit '090f4149cd7c0cc5fb9a986bc3df88fd3c0a5a71':