am c6ab2048: am b0e4a221: 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 'c6ab204836f31c568731b0879ac20b70c38998fb':