Merge "Fix QS tiles not rippling" into oc-dev
am: b8e5742f5b

Change-Id: I05ff98435f88ea489a557013fc53a8cfe12304f5