am 4f2c8cc8: (-s ours) am 36a18287: Merge "DO NOT MERGE Only show edge glow effect on 1 side at a time." into gingerbread

Merge commit '4f2c8cc86ad1b4c65806d7547407c60ea36b8abe'

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