Merge "Fix PinnerService SecurityException at boot" into rvc-dev