am 20ffcaa1: Merge "Add colorEdgeEffect to themes, default it to colorPrimary" into lmp-dev

* commit '20ffcaa121cb214ed875f4940e9ba16e82850a56':
  Add colorEdgeEffect to themes, default it to colorPrimary