Merge "Make display info accessible from hidden api." into jb-mr1-dev