Issue 806 : Merge in feature branch, resolve conflicts.
Issue 806 : Merge in feature branch, resolve conflicts.

The only conflict was from array alignment.
It was a whitespace-only edit.

GoogleForCreators/web-stories-wp,GoogleForCreators/web-stories-wp,GoogleForCreators/web-stories-wp,GoogleForCreators/web-stories-wp,GoogleForCreators/web-stories-wp