Merge "Use source stamp app targeting SDK version 29" into rvc-dev