Merge "Separate brightness-specific ProgressDrawable logic." into tm-qpr-dev