Merge "Fix the seesaw behavior on the status panels." into jb-mr1-dev