am 229e25d4: Merge "Fix bug in LayoutTransition that caused views to stay invisible"

* commit '229e25d404fde2880e3858b1df2d0d1b6f3ad9e0':
  Fix bug in LayoutTransition that caused views to stay invisible