Merge "Set colorAccent instead of colorControlActivated" into lmp-dev