Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev