Merge "Fix StrongBoxOnly test" into rvc-dev