am 6c4609ad: (-s ours) am dfe0870e: Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread

Merge commit '6c4609ada4526eea2fca4eef043d27dd07026e0a'

* commit '6c4609ada4526eea2fca4eef043d27dd07026e0a':
  DO NOT MERGE Only show edge glow effect on 1 side at a time.