Merge "ApiEditPage: Avoid PHP warning"