Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev