Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev