Merge "Make mLayoutNeeded per-Display." into jb-mr1-dev