Merge "board-msm7627a: display: Add settling delay for display resume."