Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev