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

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