Merge "Retain FRP data when FR is invoked in Settings" into rvc-dev