Merge "Fix screen turns off once triggering long press power behavior" into udc-qpr-dev