Merge "Only play up effect if its been over 100 ms" into oc-dr1-dev
am: 457c58f912

Change-Id: I0b37e6ac7195c94987534a4b2f6d593b3b94a36b