am 81ef40bc: Merge "Avoid unnecessary bringChildToFront() calls." into gb-ub-photos-carlsbad

* commit '81ef40bc4923e7014f52f03d8c7ddcf7a4344f70':
  Avoid unnecessary bringChildToFront() calls.