am 7fcb5dc5: Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev

* commit '7fcb5dc5e9fbad0f183f425e88e576aaca98b0d7':
  Pin electron beam surface to natural orientation.