Merge "Implement device lock state listener" into main