Merge "[flexiglass] Adds support for "enhanced PIN privacy"" into main