Merge "Init displays to null layer stack" into jb-mr2-dev