Merge "Add logging for screen timeout override." into pi-dev