Merge "Use right theme for drawable inflation." into lmp-dev