Merge "Record use of metadata encryption in property" into rvc-dev