Merge "Log after click: entry and shade state" into main