Merge "Add logging to screenonunblocker" into main