am 1f3ab5f4: am aa752950: am f7edf059: Merge "Set colorAccent instead of colorControlActivated" into lmp-dev

* commit '1f3ab5f4307df247cf44c23ef02217e83b9c1e2c':
  Set colorAccent instead of colorControlActivated