Merge "Lid switch state is incorrect"