Merge "Clean up displayId and layerStack usage." into jb-mr1-dev