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