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

* commit 'cc0086e4a4331762d81f17f7dcf6e55b4820193a':
  Restore parallax even if Google Now isn't present