Merge "Remove unused display + sleep" into klp-dev