am 9f16fd5b: am 56bea4d4: Merge "Defend against NaNs in panel animation code." into jb-mr2-dev

* commit '9f16fd5b12b73bfa4c781811d1963328d6594add':
  Defend against NaNs in panel animation code.