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