Merge "Update background crop animation threshold" into oc-dr1-dev