Merge "Change layout inner loop order for multi display." into jb-mr1-dev