Merge "Fixing Rotation Bug for BiometricCredMan" into main