Merge "Camera: Clear identity before access device policy manager" into main