pull commits from cyanogenmod qcom_display (jellybean branch)