Merge "Only inform DisplayManager of visible content." into jb-mr1-dev