Merge "msm: display: Handle display shutdown properly for 8x25"