merge in changes to interactive governors mostly by johnnyslt mrg666 and bigwillyg
fixed conflict in msm_fb display