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