Merge "Fix FRP setting write failure due to calling identity" into main