Merge "Ripple and opa diamond animation plays after a timeout (1/2)" into pi-dev
am: 6ef6c1603b

Change-Id: I64ce2301b7c9e38263d64b10a479698bfb4e68c4