Merge "Fix 0 duration scale for pre-O apps"