Merge "Disable electron beam on animation." into jb-mr1-dev