am 76a634e9: am 1886480d: Merge "Remove unused display + sleep" into klp-dev

* commit '76a634e9f2739c7d143808a1157871eefd28731e':
  Remove unused display + sleep