Merge "Fix parceling of display info flags." into jb-mr1-dev