Merge "msm: 9x25: display: protect gpio setting by configuration"