am 208cec02: (-s ours) am 256847d2: DO NOT MERGE Reduce edge fade

* commit '208cec02eab6cf2cbe2fdab6e14bb21119883297':
  DO NOT MERGE Reduce edge fade