Merge "Update drawable container constant state following clone" into lmp-mr1-dev