Merge "Don't wait for init done in isFrpActive()" into main