Merge "Fix screen not turning off on power button press." into udc-dev