Merge "Make indeterminate progress alpha consistent with determinate" into lmp-mr1-dev