Merge "Enforce secure FRP mode while changing credentials" into rvc-dev