am 556a65bc: Merge "Fix our pre-JB onPreparePanel() workaround" into lmp-mr1-ub-dev

* commit '556a65bcf38cb6197f018ff4700f822538758261':
  Fix our pre-JB onPreparePanel() workaround