Merge "Remove single pass actions from display loop." into jb-mr1-dev