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