Merge "Fix theme propagation to contained android:drawable elements" into lmp-dev