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

Change-Id: I0aa0b255d943fb61da61a2ab7fdd511e39588f19