Merge "Limit certain actions to default Display." into jb-mr1-dev