Merging changes synced from https://github.com/MicrosoftDocs/powerapps-docs-pr (branch live)

Author: buck1ey

powerapps-docs/developer/model-driven-apps/clientapi/reference/Xrm-Utility/getEntityMainFormDescriptor.md

@@ -22,7 +22,7 @@ search.app:
 
 ## Syntax
 
-`Xrm.Utility.getEntityDefaultMainFormDescriptor(entityName, formId);`
+`Xrm.Utility.getEntityMainFormDescriptor(entityName, formId);`
 
 ## Parameters
 

powerapps-docs/developer/model-driven-apps/clientapi/walkthrough-write-your-first-client-script.md

@@ -214,10 +214,14 @@ That's it! You have completed the steps to configure the account form to use cus
 
     ![Form event handlers](../media/form-event-handlers.png "Form event handlers")
 
-1. Select either `OnSave` or `OnLoad` event handlers and associate the function you want to achieve.
+1. Select `OnLoad` event handler and associate the function you want to achieve.
 
    ![Configure Form event handlers](../media/configure-events-on-from-handlers.png "Configure Form event handlers")
 
+1. Select `OnSave` event handler and associate the function you want to achieve.
+
+   ![Configure Form on save event handlers](../media/configure-events-on-save-handlers.png "Configure Form on save event handlers")
+
 1. If you wish to add the event handler for the on change event, select the column and then select **Event** tab.
 
      ![Onchange handler](../media/onchange-event-handler.png "Onchange handler")

powerapps-docs/developer/model-driven-apps/media/configure-events-on-from-handlers.png

@@ -5,7 +5,7 @@ author: sandhangitmsft
 ms.service: powerapps
 ms.topic: conceptual
 ms.custom: 
-ms.date: 04/21/2021
+ms.date: 05/11/2021
 ms.author: sandhan
 ms.reviewer: tapanm
 contributors:
@@ -192,7 +192,7 @@ The form's map control requires additional configuration to tell it what the IDs
 
 By default, request validation is enabled on portal resulting in following generic error if you enter script code without HTML encoding inside basic form fields:
 
-![Request validation error](../media/request-validation-error.png)
+`Found field(s) submitted with potentially dangerous value(s) such as HTML, or script. Please review the field value(s) and try again.`
 
 To disable request validation, follow these steps:
 

powerapps-docs/developer/model-driven-apps/media/configure-events-on-save-handlers.png

@@ -33,7 +33,7 @@ Create rich, interactive reports and real-time visualizations with [!INCLUDE[pn_
 > 
 > - Enable [!INCLUDE[pn_power_bi_for_office_365_short](../includes/pn-power-bi-for-office-365-short.md)] visualizations for your organization in **Settings** > **Administration** > **System Settings** > **Reporting** tab > **Allow Power BI visualization embedding**.  
 > - Have a [!INCLUDE[pn_power_bi_for_office_365_short](../includes/pn-power-bi-for-office-365-short.md)] account and have access to at least one [!INCLUDE[pn_power_bi_for_office_365_short](../includes/pn-power-bi-for-office-365-short.md)] dashboard.  
-> - Avoid adding [!INCLUDE[pn_power_bi_for_office_365_short](../includes/pn-power-bi-for-office-365-short.md)] visualizations to system dashboards; it's not supported.
+
 
 
 ## Create a personal Power BI dashboard
@@ -101,4 +101,4 @@ To show the features available with a [!INCLUDE[pn_power_bi_for_office_365_short
 
 
 
-[!INCLUDE[footer-include](../includes/footer-banner.md)]
+[!INCLUDE[footer-include](../includes/footer-banner.md)]