* Move check for 'dashboard' key to before the create/update if statement. * Add changelog fragment for PR #47459 (cherry picked from commit 880762e07e)
880762e07e