ubuntu-touch : display : Rebase from CM11 with my own changes