Merge "FavoritesFunctionalMenuItemJson class DB constraints"